Trying to sync to AIR

Trying to sync to AIR
Merge branch 'master' of https://github.com/alastaircashen/umami

Conflicts:

build/iphone/build/Debug-iphoneos/ProjectUnami.app.dSYM/Contents/Resourc
es/DWARF/ProjectUnami
	build/iphone/build/Debug-iphonesimulator/ProjectUnami.app/Info.plist
	build/iphone/build/Debug-iphonesimulator/ProjectUnami.app/ProjectUnami

build/iphone/build/ProjectUnami.build/Debug-iphonesimulator/ProjectUnami
.build/Objects-normal/i386/ApplicationDefaults.o

build/iphone/build/ProjectUnami.build/Debug-iphonesimulator/ProjectUnami
.build/Objects-normal/i386/ApplicationMods.o

build/iphone/build/ProjectUnami.build/Debug-iphonesimulator/ProjectUnami
.build/ProjectUnami.dep

build/iphone/build/ProjectUnami.build/Debug-iphonesimulator/ProjectUnami
.build/build-state.dat