çori

mori
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/application_controller.rb
Merge branch 'master' of https://github.com/thinkmobilecomtr/melih_calis