added like modal feature
Merge branch 'orhan' into jack

Conflicts:
	public/index.html
	public/js/app.js
merged with orhan