version 1.1
Merge branch 'master' of github.com:guycole/mythic-matcher-gae

Conflicts:
	.idea/.name
	.idea/compiler.xml
	.idea/encodings.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/workspace.xml
	pom.xml