Daiv commit
Merge branch 'master' of https://github.com/jpolodna01/Drury-Explorer

Conflicts:
	DruryExplorer/app/app.iml