Merge branch 'master' into live
Merge branch 'master' into live
Merge branch 'master' into live
Merge branch 'master' into live
Add database and ajax stuff
Merge branch 'live'