more validation en checking
navigation rules
navigation rules
Merge remote-tracking branch 'origin/master'