Update to 2013
Exclude close button from scroll area
Merge branch 'develop'