Doesn't ask for name each time, name is now saved
Merge branch 'master' of https://github.com/INOVA-Technology/Conquest

YAY NO MERGE CONFLICT