Merge branch 'master' of https://github.com/ranacseruet/ultra

Conflicts:
	demo.php
	js/ultra.js