Merge branch 'master' of github.com:socialigniter/socialigniter into development
Fixing master merge