Tab header for formations fixed
Merge branch 'development' into integration