changes
Merge branch 'master' of https://github.com/alextam/wip

Conflicts:
	GEEnyo/source/views/MainView.js
Merge branches 'master' and 'master' of https://github.com/alextam/wip
Merge branch 'master' of https://github.com/alextam/wip
Merge branch 'master' of https://github.com/alextam/wip
Merge branch 'master' of https://github.com/alextam/wip
no message
Merge branch 'master' of https://github.com/alextam/wip