Improved configuration loading. Dev/Prod configuration now stored outside of git repo
Added deployment-descriptor
Deployment descriptor fixed
Fixed configuration loading, to load file corresponding to environment
Improved Readme.md
Merge branch 'master' into js-tests

Conflicts:
	.gitignore