2014.7.8.1943

Small changes to accommodate Navigation development