Creating template
Merged from lightblue-all
Cleaned up sonatype repo dependency
No pulling snapshots from techpreview now
Whitespace to force build
Moved configs to module in .openshift dir
Commented out app servlet
Merge remote-tracking branch 'github/master'

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/web.xml
Added symlink in src/main to .openshift modules dir to make maintaining it easier
Moved module from .openshift/config/modules to src/main/modules and use symlink to keep support for openshift deployment