update rails
update rails
use bluecloth instead of rdiscount
Merge branch 'master' of https://github.com/randysecrist/mhealth-example-loader into dev

Conflicts:
	Gemfile.lock