asd
Merge branch 'Dev' of https://github.com/LeeJeongHo/Project into Dev

Conflicts:
	src/com/Layout/DetailInfoLayout.java