notify on error, dont break watch on error
Merge branch 'master' into new_front
resposive styles and new template dynamics