Changed calculation of area light (for cycle shortened)
Merge branch 'master' of https://github.com/jancajthaml/sgloi13

Conflicts:
	source/cpp/shader/Phong.h
	source/cpp/testapp/testapp.cpp
Texture loading
Merge branch 'master' of https://github.com/jancajthaml/sgloi13
gitignore
Loading textures done, textures not working correctly due to wrong UV calculation.