Update directories on my local machine etc
Update flashquest application directories
Merge branch 'mac'

Change directories on master