Testing Jenkins auto-build
Merge branch 'master' of https://github.com/ajpahl1008/megaevent

Conflicts:
	megaevent-services/.gitignore
	megaevent-ui/.idea/workspace.xml