Re-naming of stuff
Merge branch 'master' of https://github.com/Duolasa/PADI2014
merge and fixes