update alert view
no message
no message
Merge branch 'Alpha.1'

Conflicts:
	melon.xcodeproj/project.xcworkspace/xcuserdata/macbookair.xcuserdatad/UserInterfaceState.xcuserstate
	melon/lib/.DS_Store