misc
Merge branch 'master' of https://github.com/jinxup/jinxup

Conflicts:
	jinxup/libraries/Jinxup.php
welcome view