- Ran UIC on the interface
 - Removed __getattribute__ calls because they were generating errors
 - Migrated some of the methods
 - Migrating UI from PyQt to PySide
 - Updated Copyright years
 - Attempt to port over PySide fixes
 - Cleanup visual formatting for python vs. Qt date formats
 - Localized dates in CSV Export
 - Moved UI helpers (QStyledItemDelegate) for MainWin into same file as MainWin
 - Rearrange imports
 - PEP8
 - Cleanup abandoned code
- Settings files moved to the (platform specific) user data folder

Conflicts:
	settings.py
 - Fix minor rebase issue
 - refactored os dependencies
 - Moved pattern corrections from settings.txt into defaults.txt
 - Ported default upgrades into master
 - Added logic so the program can store user data in either a user's application data folder or in the local folder (i.e. portable installation)
 - Added a "portable.txt" file to default the program to run as a portable installation.
 - Updated version number
 - Fixed error in default German pattern
 - Updated DaleyKlippings icon in several places
 - Recompiled resource (rc) and UI files
 - Default Import and Export dropdowns on Settings Dialog to defaults
Merge branch 'AppDirs'