Updates
Merge branch 'master' of https://github.com/meet-projects/atl-y2-2014
Merge branch 'master' of https://github.com/meet-projects/atl-y2-2014