datasource
add chart
Merge branch 'master' of https://github.com/yaoiiuen/Syntis.git

Conflicts:
	Syntis/src/main/webapp/WEB-INF/spring/datasource-config.xml