cleared conflit
Merge branch 'develop' of github.com:geopcgeo/options into develop

Conflicts:
	newdevelop/a2
modified