my merge problem is resolved

my merge problem is resolved
js 1
js 2
js and some views
some additions
add again
transfer form from one view to another

transfer form from one view to another
Merge remote-tracking branch 'upstream/master'
Final design commit