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

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

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

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

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

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

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