Merge branch 'master' of /home/gdick/IdeaProjects/proteus-examples with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	example-app/.idea/artifacts/com_i2rd_example_app_example_app.xml
	example-app/.idea/artifacts/com_i2rd_example_app_example_app__exploded_.xml
	example-app/example-app.iml
Move default.properties to correct location