Updated parser.
Merged parallel changes.
Started using SonarPing.
Solved conflicts and merged parallel changes.