prepare for version 1.0
continue preparing for version 1.0
pass websites test and bug fix. Still version 0.9.9
repair conflicts