sync
Merge branch 'master' of https://github.com/whistlepost/berkleycenter_rails4
sync
Merge branch 'master' of https://github.com/whistlepost/berkleycenter_rails4
mockup2 and 3