Removed sql traces and updated startup functions
Merge remote-tracking branch 'origin/master'

Conflicts:
	CollaboRhythm.Hiviva/src/collaboRhythm/hiviva/view/Main.as
Removed sql traces and updated startup functions
Merge remote-tracking branch 'origin/master'