Merge branch 'master' of github.com:/SagePoint/sagepoint-public

git-svn-id: file:///var/svn/sagepoint-public/trunk@17 c19a6890-ad51-4bac-a907-c977e3f8e779
Merge branch 'master' of github.com:/SagePoint/sagepoint-public

git-svn-id: file:///var/svn/sagepoint-public/trunk@18 c19a6890-ad51-4bac-a907-c977e3f8e779
Merge branch 'master' of github.com:/SagePoint/sagepoint-public

git-svn-id: file:///var/svn/sagepoint-public/trunk@19 c19a6890-ad51-4bac-a907-c977e3f8e779
Merge branch 'master' of github.com:/SagePoint/sagepoint-public

git-svn-id: file:///var/svn/sagepoint-public/trunk@20 c19a6890-ad51-4bac-a907-c977e3f8e779
Merge branch 'master' of github.com:/SagePoint/sagepoint-public

git-svn-id: file:///var/svn/sagepoint-public/trunk@21 c19a6890-ad51-4bac-a907-c977e3f8e779
Merge branch 'master' of github.com:/SagePoint/sagepoint-public

git-svn-id: file:///var/svn/sagepoint-public/trunk@22 c19a6890-ad51-4bac-a907-c977e3f8e779
Merge branch 'master' of github.com:/SagePoint/sagepoint-public

git-svn-id: file:///var/svn/sagepoint-public/trunk@23 c19a6890-ad51-4bac-a907-c977e3f8e779
Merge branch 'master' of github.com:/SagePoint/sagepoint-public
Merge branch 'master' of github.com:SagePoint/sagepoint-public
Merge branch 'develop'
Modified favicon
Merge branch 'master' of github.com:SagePoint/sagepoint-public