Added grunt deploy task, which uploads a build to an ftp server
Merge remote-tracking branch 'origin/master'