20131013
*temp
Merge branch 'master' of https://github.com/sunghwanJo/NEXT_ENERGY_MAN

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