Database Backup: 08-14-2014
Merge branch master