upgrade to rails 4.2 beta
Merge branch 'master' into feature/rails4_2

Conflicts:
	app/controllers/v0/api_controller.rb
Merge pull request #11 from ploslabs/feature/rails4_2

upgrade to rails 4.2 beta