UI: Update CSS for AJS tabs
UI: Update tabset directive for html tab titles
UI: Use AJS tabs on analytic form input
Merge remote-tracking branch 'remotes/origin/master' into twill
automatically visualize the map, hide the day/night view
Merge pull request #151 from erickt/map

automatically visualize the map, hide the day/night view
Revert "automatically visualize the map, hide the day/night view"
Merge pull request #152 from Lab41/revert-151-map

Revert "automatically visualize the map, hide the day/night view"
Merge branch 'pr-analyticsformtabs'

Conflicts:
	src/main/webapp/css/less/app.css.less
Merge branch 'master' of https://github.com/Lab41/Dendrite
Complete merge of #132 with compiled app.css
Merge pull request #153 from kylef-lab41/master

Complete merge of #132 with compiled app.css
automatically visualize the map, hide the day/night view
Merge pull request #154 from erickt/map

automatically visualize the map, hide the day/night view
Merge remote-tracking branch 'remotes/origin/master' into twill
convert twill zookeeper url into a property
Make sure the graphlab temp directory is world writable
fix a typo in the algorithm property
Merge branch 'twill' into test

Conflicts:
	src/main/java/org/lab41/dendrite/services/analysis/GraphLabService.java
Merge pull request #3 from erickt/test

Test