Removed old code
Goodbye web 2.0
Merge branch 'redesign'