small fix
adding framerate enumeration and selectio, small fixes,stared to do a little bit of error handling
Merge commit '71c15ea' into dev

Conflicts:
	pupil_src/shared_modules/uvc_capture/linux_video/v4l2_capture/capture.so
Merge branch 'dev' of https://code.google.com/p/pupil into dev
updated .gitignore
fixing the merge mess