add datapermission module
Merge branch 'master' of https://github.com/leoncool/healthbook.git

Conflicts:
	src/servlets/actions/get/health/GetHealthDatastreamsList.java
edit
gitignore

gitignore
Merge branch 'master' of https://github.com/leoncool/healthbook.git
Merge branch 'master' of https://github.com/leoncool/healthbook.git
fix many things
add curl auto tomcat upload