Initial commit
Merge branch 'master' of https://github.com/susers/salon.2014.10.25