Test commit
Merge branch 'master' of https://github.com/DIYAutomotive/DIYAutomotive

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/DIYAutomotive/DIYAutomotive

Conflicts:
	src/main/webapp/WEB-INF/GeneratedSolution.jsp
	src/main/webapp/index.jsp
	src/main/webapp/new_user.jsp
Added in a lot of necessary stuff, Service Loader regex parsing yada yada
Merge branch 'master' of github.com:B-rabbit54/DIYAutomotive into B-rabbit54-master