updates
Merge branch 'master' of http://github.com/guillaume-gouchon/project-awesome
updates