20131124 15:36
Merge branch 'master' of https://github.com/skyudice/EnergyMan

Conflicts:
	EnergyMan/src/org/nhnnext/energyman/DummySectionFragment.java