Lots of updates to front end - working on getting some Ajax stuff
working
Merge remote-tracking branch 'origin/master'