Merge branch 'master' of github.com:Exlixe/TrinityAllInOne

Conflicts:
	TrinityAllInOne.suo
Merge branch 'master' of github.com:Exlixe/TrinityAllInOne