+ Created a new token parsing function.
- Merged upstream with local.
Merge origin/master

Conflicts:
	src/Property.cpp
- Trying to resolve conflicts with upstream.