More progress
Merge branch 'master' of https://github.com/JCotton1123/netmanage

Conflicts:
	Console/cake.php