merge fix
[RRRRHHHH_Artifacts] / It0Artifacts / Thumbs.db
2015-03-25 pinenemerge fix
2015-03-14 camjanit 1 sequence diagrams done