pdf to image conversion
Merge branch 'master' of https://github.com/skanjarkar/imgtovideo

Conflicts:
	public/javascripts/drawing/pdf_to_img.js