DELETE TEMP
Merge branch 'master' of https://github.com/sixxis69/July2014

Conflicts:
	Library/CurrentLayout.dwlt