Merge branch 'master' of github.com:tmdfhr711/OH_Project

Conflicts:
	WidgetTutorial/gen/com/example/widgettutorial/R.java
Merge branch 'master' of github.com:tmdfhr711/OH_Project

Conflicts:
	WidgetTutorial/gen/com/example/widgettutorial/R.java