Chart Web Service
Merge branch 'master' of https://github.com/weso/wiBackend

Conflicts:
	wiLodPortalPlay/app/controllers/Application.java