fuck shit stack
Merge branch 'master' of https://github.com/CommanderToad/Ourchive

Conflicts:
	Resources/iphone/alloy/widgets/ds.slideMenu/controllers/widget.js
	app/widgets/ds.slideMenu/views/widget.xml