Merge branch 'release/20120623-0239'
Merge branch 'release/20120624-0005'
Update master
Merge branch 'master' into develop
update template
correct objc class name
generate IBAction
add viewDidAppear, viewDidDisapper to templates