merged
preventing collision between shownav and tabs
Merge branch 'feature/showrca2014' into develop