Fork Merge 15JUN2014

Map Bug fixes and personal folder update (Personal folder will be cleaned up shortly).