steprescott/Sticky-Notes — pull request #2 by alanedwardes (2013-10-30 20:28:18+00:00)
Title: Bringing develop up to date with master.

I should've done these changes on develop but here we are.