pull 18-october
Merge branch 'master' of github.com:raeefrefai/adrr

Conflicts:
	src/app/wrapper/wrapper.tpl.html
before merge
Merge branch 'master' of github.com:raeefrefai/adrr
merge
delete, to avoid any inconsistency
merge