nicu's work

Signed-off-by: NicuOlariu <nicolaeolariu@gmail.com>
s

Signed-off-by: NicuOlariu <nicolaeolariu@gmail.com>
Merge branch 'master' of https://github.com/dimboiu/dd

Conflicts:
	custom.css
	js/main.js
	tpl_where_to_stay.php