Frontend
Bootstrap
JQuery
Controller
Controller interface
Frontend
Bootstrap
JQuery
HighChart
Merge origin/master

Conflicts:
	src/java/sessionbeans/EntityManager.java