ooi_command: can now dynamically set options in command declaration
Merge branch 'v0.6' into v0.7

Conflicts:
	ooi_command/js/main.js
Merge branch 'v0.6' into v0.7
ooi_gis_map: easier to configure entity control and layers
ooi_gis_map: put entities in different layers
ooi_gis_map: fixing automatic resizing issue
ooi_info: formatting rules
Merging recent changes from internal mockup branch
Update of dependencies to latest versions (bootstrap, jquery, angularjs)
Thumbs.db files don't need to be in the repository
Merge branch 'v0.7'

Conflicts:
	ooi_gis_map/js/maplib.js