Fixed missing return values on functions.
Added targets map to targets.html
Merge branch 'FilteredTargetsMap' into develop
Merge remote-tracking branch 'ben/develop' into labsfilmstrip04242013