Rails 4.2.0 beta, jquery 2, angularjs 1.3.rc2
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	Gemfile
	Gemfile.lock
Merge pull request #88 from indykish/0.5

rails 4.2.0 beta2, angularjs 1.3.0 rc2 and jquery 2.1