Kunstmaan/cupcake — pull request #15 by cabaret (2013-08-06 09:28:09+00:00)
Title: merge develop to master (adds slider)

merge develop to master (adds slider)