Merge branch 'master' of https://github.com/Surfynow/surfy-extension
clearMerge branch 'master' of https://github.com/Surfynow/surfy-extension
add mustache
remove .idea files
merge with upstream