Akash - cleaning up routes file
akash - #1709 - creating child media controller under api namespace to deal with android specific media calls
Merge pull request #474 from akash/master

akash - #1709 - creating child media controller under api namespace to deal with android specific media calls
[#1702] Faris : Added a second fallback to English if translation is missing in the system language.
Merge pull request #476 from akash/release-1.0.0

#1790 - added migration to upgrade form sections and updated app:reset to clear our migrations db
Merge pull request #477 from akash/master

#1790 - added migration to upgrade form sections and updated app:reset to clear our migrations db
Merge pull request #478 from farismosman/master

[#1702] [Tech Task] Add script to handle missing translations
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	config/routes.rb
	public/javascripts/translations.js