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

git-svn-id: file:///var/svn/sagepoint-public/trunk@24 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 'master' of github.com:/SagePoint/sagepoint-public
Merge branch 'master' of github.com:/SagePoint/sagepoint-public
Merge branch 'master' of github.com:/SagePoint/sagepoint-public
Merge branch 'master' of github.com:/SagePoint/sagepoint-public
Merge branch 'master' of github.com:/SagePoint/sagepoint-public
Merge branch 'master' of github.com:/SagePoint/sagepoint-public
Merge branch 'master' of github.com:/SagePoint/sagepoint-public
Merge branch 'master' of github.com:/SagePoint/sagepoint-public
Merge branch 'master' of github.com:/SagePoint/sagepoint-public
Merge branch 'master' of github.com:/SagePoint/sagepoint-public
Merge branch 'master' of github.com:/SagePoint/sagepoint-public
Fixed htaccess again again