LLLL
Merge branch 'power'

Conflicts:
	Foundation/src/main/java/kr/co/Foundation/Controller/SampleController.java