2014-06-11
Merge branch 'master' of https://github.com/DionysosLai/MapLayer

Conflicts:
	Classes/HelloWorldScene.cpp
	Classes/MapLayer.cpp
	Classes/MapLayer.h
	README.md