Added Docker support
Update README
Merge pull request #12 from buger/23-docker

Docker support
Update README.md

Typo
precompile assets for Heroku
fix bootstrap sass installation:
update user settings
add TokenField inputs
update settings page
fix merge conflicts
Added user email preferences
Merge pull request #14 from AlouaneMed/patch-2

Update README.md
Merge pull request #17 from littletimo/email_preferences

Added user email preferences
Merge pull request #16 from asm-products/AlouaneMed-review

AlouaneMed  (ASM Bounty #19)