*Please
Merge branch 'master' of github.com:sunghwanJo/NEXT_ENERGY_MAN
Please

Conflicts:
	EnergyMan/bin/classes/org/nhnnext/energyman/MainActivity.class