Update Journal Final #1
Merge branch 'master' of https://github.com/HasanAlFarisi/my_journal

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/ckeditor/foto-append.js
	app/assets/javascripts/dashboard/form_validates.js
	app/assets/stylesheets/application.css
	app/assets/stylesheets/index.css
	app/assets/stylesheets/modal.css
	app/assets/stylesheets/style-admin.css
	app/controllers/admin/base_controller.rb
	app/controllers/admin/company_profiles_controller.rb
	app/controllers/admin/contacts_controller.rb
	app/controllers/admin/profiles_controller.rb
	app/controllers/application_controller.rb
	app/controllers/dashboard/comments_controller.rb
	app/controllers/dashboard/profiles_controller.rb
	app/helpers/admin/company_profiles_helper.rb
	app/helpers/application_helper.rb
	app/mailers/admin_mailer.rb
	app/models/admin/company_profile.rb
	app/models/admin/contact.rb
	app/models/admin/profile.rb
	app/models/article.rb
	app/views/admin/articles/_form.html.erb
	app/views/admin/articles/_index.html.erb
	app/views/admin/articles/_show_comment.html.erb
	app/views/admin/articles/index.html.erb
	app/views/admin/categories/_form.html.erb
	app/views/admin/categories/index.html.erb
	app/views/admin/company_profiles/_admin.html.erb
	app/views/admin/company_profiles/_detail.html.erb
	app/views/admin/company_profiles/_form.html.erb
	app/views/admin/company_profiles/index.html.erb
	app/views/admin/gallery_groups/index.html.erb
	app/views/admin/profiles/_form.html.erb
	app/views/admin/profiles/_profile_skill.html.erb
	app/views/admin/profiles/edit.html.erb
	app/views/admin/profiles/new.html.erb
	app/views/admin/sessions/new.html.erb
	app/views/admin/shared/_header_admin.html.erb
	app/views/admin/shared/_search.html.erb
	app/views/admin/shared/_sidebar.html.erb
	app/views/admin_mailer/mail_notice.html.erb
	app/views/dashboard/comments/_form.html.erb
	app/views/dashboard/comments/create.js
	app/views/dashboard/comments/show.js
	app/views/dashboard/home/show.html.erb
	app/views/dashboard/profiles/show.html.erb
	app/views/dashboard/shared/_footer.html.erb
	app/views/dashboard/shared/_header_content.html.erb
	app/views/layouts/admin.html.erb
	app/views/layouts/application.html.erb
	config/database.yml
	config/locales/en.yml
	config/routes.rb
	db/migrate/20141001063906_create_admin_gallery_groups.rb
	db/schema.rb
	db/seeds.rb