Worked on roomie stuff
A user can now upload a description of himself
Fcuk this git shit
Fcuk git
blablub
furz
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team2

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/Skeleton/.indexes/e4/b9/b3/3/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Skeleton/.indexes/e4/b9/b3/c4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Skeleton/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Skeleton/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/4207758793.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jst.jsp.core/jspsearch/1740865703.index
	.metadata/.plugins/org.eclipse.jst.jsp.core/jspsearch/1928939837.index
	.metadata/.plugins/org.eclipse.jst.jsp.core/taglibindex/4207758793.dat
	.metadata/.plugins/org.eclipse.m2e.core/nexus/26522e0d83a422eed93329ece7565cfc/segments.gen
	.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments.gen
	.metadata/.plugins/org.eclipse.m2e.core/workspaceState.ser
	.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.wst.jsdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.wst.validation/dep.index
	.metadata/version.ini