Legacy commits
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	lib/vendor/simplesamlphp
	usr/module/demo
	usr/module/saml
	usr/module/uclient
Merge branch 'develop'
Merge branch 'develop'
Upgraded modernizr to 2.8.3 from http://modernizr.com/download/
Added sample code to file service for upload/download
Comment out deprecated code
Typo fix
Fixed registry namespace error
Merge remote branch 'pi/master' into develop
Merge remote branch 'pi/develop' into develop
Merge pull request #1202 from linzongshu/develop

Fixed registry namespace error
Improve themes
Improve themes
Improve themes
Improve themes
Update persian language
Merge pull request #1203 from voltan/develop

Improve theme