updated version number and default import

Now default import includes system_info as well as test
fixed conflict
fixed import error
added touch icons
Merge pull request #666 from ehsteve/import

updated version number and default import