small changes
merge from other machine

Merge branch 'master' of https://github.com/Rocknrolla91/forum_api