Merge branch 'develop' of https://github.com/tansaku/LocalSupport into timo_with_js
Merge branch 'timo_with_js' of https://github.com/johnnymo87/LocalSupport into timo_with_js
spec for users update
cleaned up before blocks