Cleaned up code
Modified DB scripts to work for 2 different databases
Cleaned up update notifications
Merge branch 'master' into mvc