The save & discard buttons should be aligned to the right story#1590
Merge branch 'master' of https://github.com/mistaguy/RapidFTR into pull-req-360

Conflicts:
	public/javascripts/translations.js
Merge branch 'pull-req-360'
Merge pull request #372 from akash/master

merging pull req 360