Refactored project loading in ProjectActivity to fix broken shortcuts leading to NullPointerExceptions (and possibly other crashes) in CollectorActivity
Broken shortcuts are now automatically removed.
This should fix: https://crashlytics.com/ucl-excites/android/apps/uk.ac.ucl.excites.sapelli.collector/issues/5437d946e3de5099ba0545a0

Signed-off-by: Matthias Stevens <matthias.stevens@gmail.com>
Misc.

Signed-off-by: Matthias Stevens <matthias.stevens@gmail.com>
Merge branch 'master' into projStore