Merge branch 'hotfix/0.0.2.2'
Excesive padding with "user-controls" in single post view
Merge pull request #3861 from movilla/user-controls

Excesive padding "user-controls" in single post view - Only 0.0.3.0 -
resize full scaled image to a specific width #3793
show links in sidebar #1338
Merge pull request #3818 from diasp/feature/3793-scaled-full-images

#3793 resize full scaled image to a specific width
Merge pull request #3827 from diasp/feature/1338-links-sidebar

Show links in sidebar #1338
one unicorn worker should be enough for development
Fix uncapitalization of a word
Side panel ui changes
fix #2339: set unicode-bidi property to prevent username to overlay the pubdate
Merge pull request #3930 from divout/feature/2339-rtl-usernames

fix #2339: set unicode-bidi property to prevent username to overlay the pubdate [ci skip]
Merge pull request #3920 from asphxia/3906-left-side-panel-ui-changes

Side panel ui changes
add settings web mobile
Update Devise to 2.1.3

http://blog.plataformatec.com.br/2013/01/security-announcement-devise-v2-2-3-v2-1-3-v2-0-5-and-v1-5-3-released/
Merge branch 'hotfix/0.0.2.3' into develop

Conflicts:
	Changelog.md
	Gemfile.lock
don't join the tags table here, it makes the query slower
update changelog
bump configurate
Merge pull request #3932 from marpo60/improve-tags-query

don't join the tags table here, it makes the query slower