Add uuid for iOS/Android
Add missing style xml file
Merge branch 'master' into dev

Conflicts:
	project/android/fr/hyperfiction/HypSystem.java
Typo in nmml / template file
Merge branch 'dev'