Merge branch 'dev'
reformatted code to use tab indentations
Added Import/export fix from dev.
Replaced file_get_contents() with WP file system API.
import export added check for is_serialized
javascript created minified and beautified versions of all scripts
js added links to minified js versions
Merge branch 'origin/master'

Conflicts:
	functions.php

dev should now be up to date with master