Nao commit.
Nao Commit.
NAO SERVER commit.
Merge branch 'master' of https://github.com/cms11733/cms_git

Conflicts:
	NAO/RideonNao_sample_hyemincode/res/layout/activity_timeline.xml
Merge branch 'master' of https://github.com/cms11733/cms_git
20140221 SetButton Complete