Some are born with conflicts, some achieve conflicts, some have conflicts thrust upon 'em.
fixing commits Merge branch 'master' into UF-71
cleaned up drupal-org.make and skeletor.install
We are such stuff as conflicts are made on
Some progress but not quite there...
Merge branch 'master' into UF-139
Merge branch 'UF-137' into UF-139
Fixed one last if-statement consistency issue
Fixed boundary conditions and <1/3 of a month exception
Merge branch 'master' into UF-139
Enabling linking directly from all users to specific user pages
add team-profile view, service and nid filter
add angular skill filter
Created CSS classes for left/right arrows in divs
Converted Bootstrap hidden class to ng-show and added arrows to controller and HTML
Fixed startDate and endDate sorting for projects-timeline
Merge branch 'master' into UF-143
Took out unnecessary variable sets
Successfully with help added the ability to link to the specific user page
Change pageData to page.