version 0.2
minor changes
minor changes
generic_magic.py
minor bugs
Merge branch 'master' into MagIC_beta

Conflicts:
	generic_magic.py
	thellier_gui.py
pmag_dialogs.py
some changes
specimen_k_prime now actually accessible in gui
ok button is now linked with radio buttons in import magnetometer data.  however, weird glitch introduced when selecting generic_format (screen flicker)
fix bug so that all radio buttons can be selected in 'import magnetometer file'
begin initial framework for sio_magic.  no functionality yet
working picture for import sio files
hopefully working merge with both combine_magic dialog and import sio_magic dialog
picture of CIT_magic import
adding reusable widgets for measurement import dialog boxes
more widgets working
widgets fully implemented in sio_magic and CIT_magic
more widgets, and add file button now works as a full widget
import CIT working (grabs all necessary data, does not yet run).