update gitignore to not ignore pmag_menu (this causes irritating git problems in development branch)
rename pmag_dialogs to pmag_basic_dialogs (eventually will distinguish between that and pmag_menu_dialogs)
Merge branch 'master' into MagIC_beta

Conflicts:
	.gitignore