working on ng-include for tabs
resolved merge issues