Delete composer.lock from repository
Merge branch '2.0.0' of https://github.com/phalcon/forum into 2.0.0

Conflicts:
	composer.lock
Delete composer.lock from repository
Removing YUI compressor and combine CSS scripts
Removing unused files