removed merge file.
Improved godep
update Procfile parameter port
update dev mode