escape angle brackets
fix misspelling
replace dirname(__FILE__) by __DIR__
remove doubled DS and end path variables with DS
merge
merge branch 'master' of github repo

conflicts:
	README.md
rename migration file
rename var publicFolder to publicPath