integrated js file_upload lib
feature/file_upload created UploadHelper Class
feature/file_upload Zwischenstand 28.07.2014
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
feature/file_upload

included vendor/igenerator/tokenista
feature/file_upload

merged master in branch
feature/file_upload

changed changed .gitignore file
feature/file_upload

changed changed .gitignore file
feature/file_upload

deleted all captcha images and excluded captcha_cache dir
feature/file_upload

deleted and excluded cache/twig_cache
feature/file_upload

implemented Upload Class and annotations for db relationships between Upload and User, testet in db
feature/file_upload

integrated UploadBundle codeguy/Upload from packagist.org
feature/file_upload

Zwischenstand 29.07.2014, updated .gitignore file
feature/file_upload

Zwischenstand 29.07.2014
implemented UploadHelper
master

cleaned vendor
master

deleted twig_cache
master

Zwischenstand
feature/file_upload

solved general problems in vendor