fix up imports
simplify security
add info about branches.
update to java 8
Conflicts:
	.classpath
	.settings/org.eclipse.wst.common.project.facet.core.xml
	pom.xml
	src/main/java/rebel.xml
Merge app fixes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.classpath
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	pom.xml