mac sync, 10/15/2014, 1
Merge branch 'master' of https://github.com/agileminor/shared_files