fixed a few bugs and began with merging of shader programs.
Merge branch 'master' of https://github.com/advancedrendering/project
major changes
- merging of shader finished. (exists only one shader)