Changed ding_page to use development branch in make file
Removed version number from info file as it do not match release
Resovled merge conflict in make file