testings
reverted quicktabs back to default before testing
Merge origin/develop into develop