folder structure changed, User API implemented
Merge remote-tracking branch 'origin/Lenticularis' into Lenticularis

Conflicts:
	Includes/api.inc.php