Lots of Update

1. CSS to SCSS
2. Journal Paper update

Conflicts:
	Gemfile.lock
	app/assets/javascripts/orbitdesktop.js
	app/assets/stylesheets/desktop/desktop-main.css
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb

.gitignore

@@ -1,23 +1,20 @@
 !.gitignore
-Gemfile.lock
 .bundle
-db/*.sqlite3
-log/*.log
-tmp/**/*
-public/uploads/**/*
-uploads/**/*
-public/panel/**/*
-public/index.html
 .DS_Store
-solr/data/**/*
-*.swp
-*.pid
-*.lck
-public/assets
-config/application.rb
-
 .rvmrc
 
-app/assets/javascripts/.DS_Store
+Gemfile.lock
 
+db/*.sqlite3
+log/*.log
+public/assets
+public/index.html
+public/panel/**/*
+public/uploads/**/*
 solr
+tmp/**/*
+uploads/**/*
+
+*.swp
+*.pid
+*.lck