not the right changes
Merge branch 'master' of https://github.com/rich1210/Tracy

Conflicts:
	FrozenSwirlLWP/AndroidLWP/FrozenSwirlLWP/bin/classes/com/Pineappsels/FrozenSwirlLWP/FrozenSwirlLWP.class
	FrozenSwirlLWP/AndroidLWP/FrozenSwirlLWP/bin/classes/com/Pineappsels/FrozenSwirlLWP/FrozenSwirlLWPSettings$1.class
	FrozenSwirlLWP/AndroidLWP/FrozenSwirlLWP/bin/classes/com/Pineappsels/FrozenSwirlLWP/FrozenSwirlLWPSettings.class
	FrozenSwirlLWP/Assembly-CSharp.pidb
	FrozenSwirlLWP/FrozenSwirlLWP-csharp.sln
	FrozenSwirlLWP/FrozenSwirlLWP.sln
	FrozenSwirlLWP/FrozenSwirlLWP.userprefs
	FrozenSwirlLWP/Library/assetDatabase3