thingsssssss
Bugfixing
Merge remote-tracking branch 'origin/FileDownloadUnzip'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/MainActivity.java
Animations
Abstracted pivot orientation in Tool Fragment
Abstracted pivot orientation in Tool Fragment
Abstracted pivot orientation in Tool Fragment
Schema Added
Merge remote-tracking branch 'origin/master'
Abstracted pivot orientation in Tool Fragment
Mergefix
Merge remote-tracking branch 'origin/Nathalie'

Conflicts:
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/MainActivity.java
CrashFix (IllegalStateException) for communicator
Merge remote-tracking branch 'origin/FileDownloadUnzip'

Conflicts:
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/MainActivity.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/ca/mixitmedia/ghostcatcher/experience/gcEngine.java
Abstracted pivot orientation in Tool Fragment
NFC Automator
Merge remote-tracking branch 'origin/Nathalie'

Conflicts:
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/MainActivity.java
NFC Automator
Fixed the map gesture bug...sort of.