Restructured angular code to use different view templates instead of ng-if directives.
Resolved merge conflicts
Merge pull request #96 from jjacobskind/angular_restructure

Angular restructure