working status
Merge remote-tracking branch 'origin/master' into saschanaz-executable

Conflicts:
	sources/cell.cpp
	sources/hero.cpp
	sources/hero.hpp
directory change
removed setters
20141105 rollup
move embind declaration to wrapper
Emscripten update (1.22 to 1.25)
dfsdf
typescript
vs
trying grid layout
This is a perfect grid layout polyfill!
남자1이미지 파일 크기 수정
map

powerpoint로 구성한 map UI
ui모음 파일
Update hero.cpp
Update hero.cpp
Create cell_array
ads
Update CalculMonthDay.cpp