Merge pull request #10 from Caf131/JDlux-master

J dlux master
Merge branch 'dev-doo-dah-cforehand' of https://github.com/Caf131/com-doo-dah-app into dev-doo-dah-cforehand
ActivityService, Updated all navigation links to point to correct files, renamed some files to have .php extension

Need to incorporate sessions
Merge pull request #11 from Caf131/dev-doo-dah-cforehand

Dev doo dah cforehand