Merge branch 'hotfix/20131120'
remove submodule for kostache
add kostache files instead of using submodule (temporary fix)
Merge branch 'hotfix/mustache-http-issue' into develop