20131012 19:00
Merge branch 'master' of https://github.com/sunghwanJo/NEXT_ENERGY_MAN

Conflicts:
	EnergyMan/bin/EnergyMan.apk
	EnergyMan/bin/classes.dex
	EnergyMan/bin/classes/org/nhnnext/energyman/MainActivity.class
	EnergyMan/bin/resources.ap_