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