Removed old design from master.
Listed current branches
Merge branch 'master' into 2014-spring