..
Merge branch 'dev' of https://github.com/XimenTech/SHTP into dev

Conflicts:
	view/v_main.php