Update from live 2014-02-27

Updates the project to reflect changes that have been made on the live server. Includes stuff like cache and uploaded files that we might want to remove at a later date.