saving local
Merge branch 'master' of github.com:socialigniter/socialigniter
Merge branch 'master' of github.com:socialigniter/socialigniter
Merge branch 'master' of github.com:socialigniter/socialigniter
Merge branch 'master' of github.com:socialigniter/socialigniter
changed footer URLs to https
added htmlentities() to item_linkify() in feed_helper
Merge branch 'master' of github.com:socialigniter/socialigniter
Merge branch 'master' of github.com:socialigniter/socialigniter
Merge branch 'development' of github.com:socialigniter/socialigniter
Merge branches 'master' and 'development' of github.com:socialigniter/socialigniter into development
Merge branch 'master' of github.com:socialigniter/socialigniter into development
Some minor update to .htaccess
Fixed merge conflict in feed_helper