Merge branch 'master' into rails4

Conflicts:
	README.md
	vendor/assets/javascripts/moment.js
Added momentjs-rails as dependency
Revoved unnecessary dependecy from README