commit
Merge branch 'master' of github.com:rinzaimedia/jenkinscms

Conflicts:
	application/models/login_model.php
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms
Merge branch 'master' of github.com:rinzaimedia/jenkinscms