2014-07-23 commit fromlaptop
Changes before merge home laptop 2014-07-23
Trying to pull changes from github