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