upgrading to 3.0.2
fixing version number on page
 merging
merging
updating page title version number