* Set goal data
Merge branch 'master' of github.com:skyudice/EnergyMan

Conflicts:
	EnergyMan/res/layout/acivity_goal.xml
	EnergyMan/src/org/nhnnext/energyman/GoalActivity.java
	EnergyMan/src/org/nhnnext/energyman/SetupActivity.java
Merge branch 'master' of github.com:skyudice/EnergyMan