Merge remote-tracking branch 'origin/NetBeans'

Conflicts:
	app/routes.php