JRuby and Rails 4.1.6 Initialize
Merge branch 'develop' of github.com:lenatech/PrayerLand into develop

Conflicts:
	README.md