registration and upload page design added with template
pull conflict resolved