new design

Change-Id: Iad848be5b4dc2e331e3b43c1a8a6d9ba27a4818b
2013 is dead, long live 2014!
Merge branch 'master' of https://github.com/CyanDreamProject/GetCD

Conflicts:
	getcd/templates/base.mako