initial commit
add maven support
conf file
add conf file
Merge branch 'master' of github.com:batiot/angularjs-demo

Conflicts:
	README.md