Changed file manager to Forklift.
Change bindings to mash dominant
Merge branch 'master' of https://github.com/eugeii/conf-phoenix

Conflicts:
	.phoenix.js
Merge