Started optimizing for smartphones
Merge remote-tracking branch 'origin/master'

Conflicts:
	Source/src/main/webapp/pages/adDescription.jsp