feature/file_upload Zwischenstand 28.07.2014
Merge branch 'feature/file_upload' of https://github.com/stefanstelzer/ownmvc into feature/file_upload

Conflicts:
	.idea/workspace.xml
feature/file_uplod

cleaned dir