sync
Merge branch 'master' of https://github.com/codemomentum/phadoop

Conflicts:
	phadoop-ui/src/phadoop_ui/view/phadoop.clj
sync
trigger properly
screenshot