new design.
Merge branch 'master' of https://github.com/ahmettek/goygoy

Conflicts:
	public/js/module/goygoyManagement.js