Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	.idea/workspace.xml
	app/controllers/apps/backend/staffs_controller.rb
	app/models/profile/profileable.rb
	app/navigations/backend/staff_navigation.rb
	app/navigations/frontend/main_navigation.rb
	app/views/apps/backend/replies/answer.html.slim
	app/views/apps/backend/replies/assign.slim
	app/views/apps/backend/staffs/edit.html.slim
	app/views/apps/backend/staffs/show.html.slim
	app/views/apps/frontend/enquiries/show.html.slim
	config/locales/activerecord.de.yml
	config/locales/de.yml
	config/locales/en.yml
	db/migrate/20121113234124_create_replies.rb
	db/schema.rb
	db/seeds.rb
	log/localeapp.yml
	public/uploads/company/logo/1/large_bawag-psk.png
	public/uploads/company/logo/1/medium_bawag-psk.png
	public/uploads/company/logo/1/thumb_bawag-psk.png
	public/uploads/company/logo/2/large_bank-austria.png
	public/uploads/company/logo/2/medium_bank-austria.png
	public/uploads/company/logo/2/thumb_bank-austria.png
	public/uploads/company/logo/3/large_erste-bank.png
	public/uploads/company/logo/3/medium_erste-bank.png
	public/uploads/company/logo/3/thumb_erste-bank.png
	public/uploads/company/logo/4/large_raiffeisen-bank.png
	public/uploads/company/logo/4/medium_raiffeisen-bank.png
	public/uploads/company/logo/4/thumb_raiffeisen-bank.png
	public/uploads/company/logo/5/large_allianz.png
	public/uploads/company/logo/5/medium_allianz.png
	public/uploads/company/logo/5/thumb_allianz.png
	public/uploads/company/logo/6/large_bankhaus-spangler.png
	public/uploads/company/logo/6/medium_bankhaus-spangler.png
	public/uploads/company/logo/6/thumb_bankhaus-spangler.png
	public/uploads/company/logo/7/large_hypo-aple.png
	public/uploads/company/logo/7/medium_hypo-aple.png
	public/uploads/company/logo/7/thumb_hypo-aple.png
	public/uploads/company/logo/8/large_krentschker.png
	public/uploads/company/logo/8/medium_krentschker.png
	public/uploads/company/logo/8/thumb_krentschker.png