Merge master branch changes
Add main.js back to deal with merge conflict
Resolve conflict with pom.xml
Remove commented out quartz dependency
Pull from master
Add back some things from local angular branch
Re-implemented tests