Merge branch 'feature/strictSkills' into dev

Conflicts:
	service/character.py

Implements strict skill requirement handling

service/character.py

@@ -383,12 +383,9 @@ class Character(object):
             return
 
         if isinstance(level, basestring) or level > 5 or level < 0:
-            skill.level = None
+            skill.setLevel(None, persist)
         else:
-            skill.level = level
-
-        if persist:
-            skill.saveLevel()
+            skill.setLevel(level, persist)
 
         eos.db.commit()