hitdea - floor for Techweek Los Angeles/2014
Merge branch 'hitdea' into develop
Merge branch 'develop' of github.com:fractalsoft/customers-designs into develop