Merge pull request #698 from buttonmen-dev/master

bring all 2014 code from master (dev site branch) to production (main site branch)
Merge pull request #701 from buttonmen-dev/master

prod site update to bring in backups
Merge branch 'production' of github.com:buttonmen-dev/buttonmen