Merge branch 'master' of github.com:ZAM-/TeamworkEnglewoodGit

Conflicts:
	app/models/FileSystem.php
Merge branch 'master' of github.com:ZAM-/TeamworkEnglewoodGit

Conflicts:
	app/models/FileSystem.php
Merge branch 'master' of github.com:CSC495-2014/TeamworkEnglewoodGit
Copy and Move functions added.
Added Copy, Move, and Make Directory.
Fixed removeDir call scope and mkDir mode.
mkDir mode set to 0700
Merge pull request #86 from jkwendt/master

File System Backend
Fixed projects page hack.
merge conflicts removed