First commit
Merge branch 'master' of dev.junde.info:shinescrum