file structure stuff
Merge branch 'master' of https://github.com/samjhill/MiddleMan
Merge branch 'master' of https://github.com/samjhill/MiddleMan

Conflicts:
	Middleman/Middleman/src/main/res/values/strings.xml