Add jqxwidget
Merge branch 'master' of github.com:HackGen/UniAsk

Conflicts:
	application/views/welcome_message.php
Recover welcome_message
Merge branch 'master' of github.com:HackGen/UniAsk
Add window
Merge branch 'master' of github.com:HackGen/UniAsk