removing piwik
removing luggage_piwik
repairing .gitmodules from unique
Merge branch 'development' into release

Conflicts:
	.gitmodules
Merge branch 'unique' into release