button added in layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	PullPit/war/WEB-INF/web.xml