marvilene/marvilene — pull request #11 by marvilene (2012-08-19 02:26:30+00:00)
Title: Merge new feature redesign into develop

Merge new feature redesign into develop