small changes to the view manager and the view
Merge branch 'master' of github.com:chili-epfl/eTapaCarp

Conflicts:
	packages/ViewManager/viewmanager.js
UI changes
activity3 init
ignoring .DS_store files