precompile assets
Merge branch 'master' of https://github.com/thunderdomes/erdioo

Conflicts:
	Erdioo/Erdioo.xcodeproj/project.xcworkspace/xcuserdata/macbookair.xcuserdatad/UserInterfaceState.xcuserstate