fixing #172
Merge branch 'dev' of github.com:anchorcms/anchor-cms into 0.9