javadoc update.
Merge pull request #4 from allenxwang/gh-pages

javadoc update
javadoc updated to 0.3.3.
Merge pull request #25 from allenxwang/gh-pages

javadoc update to reflect 0.3.3 version APIs
Javadoc and Scaladoc updates.
Merge branch 'gh-pages' of https://github.com/Netflix/archaius into gh-pages

Conflicts:
	javadoc/allclasses-frame.html
	javadoc/allclasses-noframe.html
	javadoc/com/netflix/config/AbstractDynamicPropertyListener.EventType.html
	javadoc/com/netflix/config/AbstractDynamicPropertyListener.html
	javadoc/com/netflix/config/AbstractPollingScheduler.html
	javadoc/com/netflix/config/AggregatedConfiguration.html
	javadoc/com/netflix/config/ClasspathPropertiesConfiguration.html
	javadoc/com/netflix/config/ConcurrentCompositeConfiguration.html
	javadoc/com/netflix/config/ConcurrentMapConfiguration.html
	javadoc/com/netflix/config/ConfigurationBackedDynamicPropertySupportImpl.html
	javadoc/com/netflix/config/ConfigurationBasedDeploymentContext.html
	javadoc/com/netflix/config/ConfigurationManager.html
	javadoc/com/netflix/config/ConfigurationWithPollingSource.html
	javadoc/com/netflix/config/DeploymentContext.html
	javadoc/com/netflix/config/DynamicBooleanProperty.html
	javadoc/com/netflix/config/DynamicConfiguration.html
	javadoc/com/netflix/config/DynamicDoubleProperty.html
	javadoc/com/netflix/config/DynamicFloatProperty.html
	javadoc/com/netflix/config/DynamicIntProperty.html
	javadoc/com/netflix/config/DynamicLongProperty.html
	javadoc/com/netflix/config/DynamicProperty.html
	javadoc/com/netflix/config/DynamicPropertyFactory.html
	javadoc/com/netflix/config/DynamicPropertySupport.html
	javadoc/com/netflix/config/DynamicStringProperty.html
	javadoc/com/netflix/config/DynamicURLConfiguration.html
	javadoc/com/netflix/config/ExpandedConfigurationListenerAdapter.html
	javadoc/com/netflix/config/FixedDelayPollingScheduler.html
	javadoc/com/netflix/config/MissingConfigurationSourceException.html
	javadoc/com/netflix/config/PollListener.EventType.html
	javadoc/com/netflix/config/PollListener.html
	javadoc/com/netflix/config/PollResult.html
	javadoc/com/netflix/config/PolledConfigurationSource.html
	javadoc/com/netflix/config/PropertyListener.html
	javadoc/com/netflix/config/PropertyWrapper.html
	javadoc/com/netflix/config/SimpleDeploymentContext.html
	javadoc/com/netflix/config/WebApplicationProperties.html
	javadoc/com/netflix/config/jmx/BaseConfigMBean.html
	javadoc/com/netflix/config/jmx/ConfigJMXManager.html
	javadoc/com/netflix/config/jmx/ConfigMBean.html
	javadoc/com/netflix/config/jmx/package-frame.html
	javadoc/com/netflix/config/jmx/package-summary.html
	javadoc/com/netflix/config/jmx/package-tree.html
	javadoc/com/netflix/config/package-frame.html
	javadoc/com/netflix/config/package-summary.html
	javadoc/com/netflix/config/package-tree.html
	javadoc/com/netflix/config/samples/SampleApplication.html
	javadoc/com/netflix/config/samples/SampleApplicationWithDefaultConfiguration.html
	javadoc/com/netflix/config/samples/package-frame.html
	javadoc/com/netflix/config/samples/package-summary.html
	javadoc/com/netflix/config/samples/package-tree.html
	javadoc/com/netflix/config/sources/JDBCConfigurationSource.html
	javadoc/com/netflix/config/sources/URLConfigurationSource.html
	javadoc/com/netflix/config/sources/package-frame.html
	javadoc/com/netflix/config/sources/package-summary.html
	javadoc/com/netflix/config/sources/package-tree.html
	javadoc/com/netflix/config/util/ConfigurationUtils.html
	javadoc/com/netflix/config/util/package-frame.html
	javadoc/com/netflix/config/util/package-summary.html
	javadoc/com/netflix/config/util/package-tree.html
	javadoc/constant-values.html
	javadoc/deprecated-list.html
	javadoc/help-doc.html
	javadoc/index-all.html
	javadoc/index.html
	javadoc/overview-frame.html
	javadoc/overview-summary.html
	javadoc/overview-tree.html
	javadoc/serialized-form.html
Merge pull request #27 from gorzell/gh-pages

Updates for java and scala docs
Add project background image.
Merge pull request #28 from allenxwang/gh-pages

add project background image
updated
javadoc update
Merge branch 'gh-pages' of github.com:Netflix/archaius into gh-pages

Conflicts:
	archaius-aws-javadoc/com/netflix/config/sources/package-frame.html
	archaius-core-javadoc/allclasses-frame.html
	archaius-core-javadoc/allclasses-noframe.html
	archaius-core-javadoc/com/netflix/config/AbstractDynamicPropertyListener.EventType.html
	archaius-core-javadoc/com/netflix/config/AbstractDynamicPropertyListener.html
	archaius-core-javadoc/com/netflix/config/AbstractPollingScheduler.html
	archaius-core-javadoc/com/netflix/config/AggregatedConfiguration.html
	archaius-core-javadoc/com/netflix/config/ClasspathPropertiesConfiguration.html
	archaius-core-javadoc/com/netflix/config/ConcurrentCompositeConfiguration.html
	archaius-core-javadoc/com/netflix/config/ConcurrentMapConfiguration.html
	archaius-core-javadoc/com/netflix/config/ConfigurationBackedDynamicPropertySupportImpl.html
	archaius-core-javadoc/com/netflix/config/ConfigurationBasedDeploymentContext.html
	archaius-core-javadoc/com/netflix/config/ConfigurationManager.html
	archaius-core-javadoc/com/netflix/config/ConfigurationWithPollingSource.html
	archaius-core-javadoc/com/netflix/config/DeploymentContext.html
	archaius-core-javadoc/com/netflix/config/DynamicBooleanProperty.html
	archaius-core-javadoc/com/netflix/config/DynamicConfiguration.html
	archaius-core-javadoc/com/netflix/config/DynamicDoubleProperty.html
	archaius-core-javadoc/com/netflix/config/DynamicFloatProperty.html
	archaius-core-javadoc/com/netflix/config/DynamicIntProperty.html
	archaius-core-javadoc/com/netflix/config/DynamicLongProperty.html
	archaius-core-javadoc/com/netflix/config/DynamicProperty.html
	archaius-core-javadoc/com/netflix/config/DynamicPropertyFactory.html
	archaius-core-javadoc/com/netflix/config/DynamicPropertySupport.html
	archaius-core-javadoc/com/netflix/config/DynamicStringProperty.html
	archaius-core-javadoc/com/netflix/config/DynamicURLConfiguration.html
	archaius-core-javadoc/com/netflix/config/ExpandedConfigurationListenerAdapter.html
	archaius-core-javadoc/com/netflix/config/FixedDelayPollingScheduler.html
	archaius-core-javadoc/com/netflix/config/MissingConfigurationSourceException.html
	archaius-core-javadoc/com/netflix/config/PollListener.EventType.html
	archaius-core-javadoc/com/netflix/config/PollListener.html
	archaius-core-javadoc/com/netflix/config/PollResult.html
	archaius-core-javadoc/com/netflix/config/PolledConfigurationSource.html
	archaius-core-javadoc/com/netflix/config/PropertyListener.html
	archaius-core-javadoc/com/netflix/config/PropertyWrapper.html
	archaius-core-javadoc/com/netflix/config/SimpleDeploymentContext.html
	archaius-core-javadoc/com/netflix/config/WebApplicationProperties.html
	archaius-core-javadoc/com/netflix/config/jmx/BaseConfigMBean.html
	archaius-core-javadoc/com/netflix/config/jmx/ConfigJMXManager.html
	archaius-core-javadoc/com/netflix/config/jmx/ConfigMBean.html
	archaius-core-javadoc/com/netflix/config/jmx/package-frame.html
	archaius-core-javadoc/com/netflix/config/jmx/package-summary.html
	archaius-core-javadoc/com/netflix/config/jmx/package-tree.html
	archaius-core-javadoc/com/netflix/config/package-frame.html
	archaius-core-javadoc/com/netflix/config/package-summary.html
	archaius-core-javadoc/com/netflix/config/package-tree.html
	archaius-core-javadoc/com/netflix/config/samples/SampleApplication.html
	archaius-core-javadoc/com/netflix/config/samples/SampleApplicationWithDefaultConfiguration.html
	archaius-core-javadoc/com/netflix/config/samples/package-frame.html
	archaius-core-javadoc/com/netflix/config/samples/package-summary.html
	archaius-core-javadoc/com/netflix/config/samples/package-tree.html
	archaius-core-javadoc/com/netflix/config/sources/JDBCConfigurationSource.html
	archaius-core-javadoc/com/netflix/config/sources/URLConfigurationSource.html
	archaius-core-javadoc/com/netflix/config/sources/package-frame.html
	archaius-core-javadoc/com/netflix/config/sources/package-summary.html
	archaius-core-javadoc/com/netflix/config/sources/package-tree.html
	archaius-core-javadoc/com/netflix/config/util/ConfigurationUtils.html
	archaius-core-javadoc/com/netflix/config/util/package-summary.html
	archaius-core-javadoc/com/netflix/config/util/package-tree.html
	archaius-core-javadoc/constant-values.html
	archaius-core-javadoc/deprecated-list.html
	archaius-core-javadoc/help-doc.html
	archaius-core-javadoc/index-all.html
	archaius-core-javadoc/index.html
	archaius-core-javadoc/overview-frame.html
	archaius-core-javadoc/overview-summary.html
	archaius-core-javadoc/overview-tree.html
	archaius-core-javadoc/serialized-form.html
Merge pull request #71 from allenxwang/gh-pages

javadoc update
Revert "Bump the major release number to reflect major changes in scala package."

This reverts commit a5822790505fad4ef3d530dca41f19b38ac34b1b.
Merge branch 'gh-pages' of https://github.com/howardyuan/archaius into howardyuan-master

Conflicts:
	.gitignore
Merge branch 'howardyuan-master'

Conflicts:
	gradle.properties