commit changes
Merge branch 'master' of https://github.com/samjhill/MiddleMan

Conflicts:
	Middleman/.idea/gradle.xml
	Middleman/Middleman.iml
	Middleman/Middleman/Middleman-Middleman.iml