Merge tag '20140119-1710' into develop

404
fixes
text
devise
revert
typo
features
Merge branch 'release/20140120-1210'