Merge pull request #1 from johnapost/dev

Dev
Merge pull request #2 from johnapost/dev

Dev
Merge pull request #3 from johnapost/dev

SQL dump of dev db in db/backups
Merge pull request #4 from johnapost/dev

Dev
Remove forgotten puts message in controller