removed unnecessary comments
Changed label for tweet objects
Merge branch 'develop' into facebook

# By Jason Harwig (8) and others
# Via Gordon Shankman (2) and Jason Harwig (1)
* develop: (22 commits)
  Fix image/video previews disappearing on vertex selection
  Vertex list wasn't handling updating _glyphIcon correctly on verticesUpdated events. Don't reload the image unless the icon changes.
  refactor audit for entities
  refactored auditing for twitter
  audit entity create on ingest
  add hash map of old properties
  Hide predicate select field if property datatype is double.
  Updated development environment installation instructions.
  Redraw the features after panning. Removes some artifacts on markers
  Redraw the features after fitting. Removes some artifacts on markers
  Show label under search field that shows how many (if any) filters are currently active. Clicking that label will remove all filters.
  Added maven-compiler-plugin declaration to all child POMs to ensure source/target settings propagate correctly.
  Added cause to RuntimeException generated in BaseArtifactProcessingBolt.  This shows a more useful error message when the enterprise Storm topology fails.
  fix duplicate filename conflicts
  Add controls object to map view. Some hacks needed to prevent map from stopping mousemove events (for panning.)
  changes for EC2
  Scale the data extent to effectively zoom out to show the current markers on map.
  refactor image object detection to be pluggable
  change to capture only UnsatisfiedLinkError
  add more error info to load opencv
  ...
Merge branch 'develop' into facebook

# By David Singley (5) and others
# Via Susan Feng
* develop:
  fix auditing of detected objects' json
  fix audit message for deletion
  audit messages on both the entity and artifact
  refactored for better logging and JMX counts
  configure storm and kafka in clusters
  correct overzealous stage assignment
  move firewall modification to the 'first' stage
  move ack
  fix compile error
  only talk about git in the git macro
  build the .war and uber-jars
Merge branch 'develop' into facebook

# By Jason Harwig (24) and others
# Via Joe Ferner (5) and others
* develop: (74 commits)
  fix audit message on dest vertex
  add creation location of relationship to audit message
  fix Kafka to use multiple zk servers
  fix KafkaWorkQueueRepository to work with multiple zk servers
  Added missing plugin configurations for classpath caching.
  remove old web controls files
  Add js dependencies directory to git ignored list
  Removed property-based repository definitions because they were not resolving properly.
  Adding explicit Lumify repository declaration so projects can find the parent POM.
  Removed lumify-root from lumify-public repository.
  removed duplicate profiles
  remove <? extends RowKey>
  remove <? extends RowKey>
  Refactoring projects to match lumify-* convention.  Updated POMs to support inheritance from new lumify-root.  Updated scripts and web server classes to point to new paths.
  Refactoring projects to match lumify-* convention.  Updated POMs to support inheritance from new lumify-root.  Updated scripts and web server classes to point to new paths.
  removed bounding box property
  removed bounding box property
  add provisioning to create /opt/lumify/logs
  remove date from filename for archives
  remove date from filename for archives
  ...

Conflicts:
	lumify-facebook/data/ontology/glyphicons_390_facebook@2x.png
	lumify-public/lumify-web/src/main/webapp/img/glyphicons/glyphicons_390_facebook@2x.png
	lumify-public/web/src/main/webapp/img/glyphicons/glyphicons_390_facebook@2x.png
	pom.xml
Merge branch 'develop' into facebook

* develop: (43 commits)
  only build what you need (unless you're building everything)
  only one /kafka at the end of the list
  process all property files in /opt/lumify/config
  add storm deploy
  updating docs
  add config to all nodes
  fixed multiple zk servers in kafka producer
  Remove console.log
  Edge selection style
  Use pathfinding to place vertices when finding by path
  add lumify root as subtree
  add zookeeper server
  ensure kafka directory exists
  configure sbt to use the proxy in EC2
  move stage to site.pp
  Added initial site descriptor and configured maven site plugin to generate Cobertura, PMD, FindBugs, and Checkstyle reports.  Added lumify-build-tools module for common configurations, such as checkstyle.
  fix kafka_host_ipaddresses
  check to make sure for frame the line is a number
  added log to next tuple
  Removed property-based repository definitions because they were not resolving properly.
  ...
added timeouts and spout queue size
Removed unnecessary codeQuality profile.  Added licensing and organization sections to lumify-public POM.
change how log4j gets initialized in command line applications
Merge branch 'develop' into facebook

* develop:
  go back to mvn'ing too much
  fix source
  make authentication_provider available to the template
  change how log4j gets initialized in command line applications
  Removed unnecessary codeQuality profile.  Added licensing and organization sections to lumify-public POM.
  change name to be more in line with others
  add log dir
  added object detection config info
  fix screenshot path
  change content type extractor injected via provider to allow web to start and not instantiate it
  reformat
  remove vaast
  update paths
  fix base class name, configure firewall for ntp
  configure ntp
  added additional properties to config file
  added timeouts and spout queue size
  removed reference to properties for lumify repo
  Moved cobertura to the codeQuality profile to fix build errors on OS X/JDK 6.  Further investigation into solving this problem is necessary so this profile can be used in the future by all developers.
added child opts to storm runners
refactored storm runner to have a commons base class and made some of the repos singletons
Merge branch 'develop' into facebook

* develop:
  ignore COPYING file from hdfs
  rename command line parameter from taskcount to tasksperbolt
  refactored storm runner to have a commons base class and made some of the repos singletons
  account for EBS boot volumes, improve formatting
  'upgrade' storm to commons-io 2.4
  fix formatting
  initialize logger
  format
  add link to download titan for gremlin shell
  added child opts to storm runners
refactored twitter pom.xml to be more like other storm pom.xml files
Merge branch 'develop' into facebook

* develop:
  refactored twitter pom.xml to be more like other storm pom.xml files
rename twitter spout
Moved BaseFileSystemSpout and HdfsFileSystemSpout to lumify-public so they can be used by the lumify-twitter project.  Moved HDFS-based twitter ingest bolt to lumify-twitter.  Reconfigured lumify-twitter’s StormRunner so it accepts the parameters —no-query and —no-file to turn off either the streaming or HDFS-based spout.

Updated ContentTypeSorterBolt to ensure queue target directories exist before it tries to move files to those queues.  This is critical for the .lumify-queue method of identifying processing queues though we may want to look into some kind of check to avoid invalid queue names, maybe restricting them to [a-zA-Z0-9_]*?
Removed accidental commit of spock dependencies from lumify-twitter POM.
Merge branch 'develop' into raw-tweets

Conflicts:
	lumify-twitter/src/main/java/com/altamiracorp/lumify/storm/twitter/StormRunner.java
start maven build-number plugin configuration