Remove deprecated aloha init script
Merge remote-tracking branch 'origin/master' into marek

Conflicts:
	Controller/JsloaderController.php