initial commit
add fix for tomcat build
changes for tomcat
Merge branch 'master' of https://github.com/ibigfoot/auraTemplate

Conflicts:
	.gitignore
	pom.xml
	src/main/webapp/WEB-INF/components/firstAura/firstAura/firstAura.app
	src/main/webapp/WEB-INF/web.xml
	system.properties