Initial Commit
fix core path
Revert "Removing a template cache file"

This reverts commit 43db5ba305c85b1dac1db8b4fd130463497f8a34.
revert to 43db5ba305c85b1dac1db8b4fd130463497f8a34
Merge branch 'master' into dev