Implementing basic search
Thumbnail first try
Placeholder image in index
Updated commons upload dependency.
Upload working
Image path mapping not
Moved Image folder
Merge remote-tracking branch 'origin/flo'

Conflicts:
	Skeleton/src/main/webapp/WEB-INF/config/springMVC.xml
Merge branch 'master' into Test