Remove todo comments which have been fixed
Merge branch 'server_setup' into develop
fix native signup and login links in devise