Merge pull request #1 from eklami/master

Iniital TargetingView
Rename main canvas variable names to avoid name conflicts
Add data structures shared by different views in
Initial newspaperview
Merge pull request #2 from Annika-a/newmaster

Initial newspaperview
Basic selection between locations.