Checkin
Merge branch 'master' of https://github.com/Almond-Labs/SP2013-Starter.git