Lei's first commit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	iosapp/HAMEditNodeViewController.m
	iosapp/managers/HAMConfig.h
	iosapp/settings/HAMNodeSelectorViewController.m
	iosapp/settings/HAMNodeSelectorViewController.xib
remove the use of EditNode
Merge remote-tracking branch 'upstream/master'

Conflicts:
	iosapp.xcodeproj/project.pbxproj
Could dance with bugs now.
Merge pull request #1 from lei-april/master

Major functions are implemented