added: user authentication functional
Merge branch 'master' into production

Conflicts:
	app/controllers/pages_controller.rb
conflicts fixed
edited: scope :locale route enabled