bookstore orderform
Merge branch 'master' of https://github.com/mattrebor/emsiweb.git into
dan2

Conflicts:
	src/main/resources/datasource-tx-jpa.xml
	src/main/webapp/scripts/app/app.js
Merge pull request #86 from mattrebor/dan2

Dan2
Merge branch 'master' of https://github.com/mattrebor/emsiweb.git into rob