Revert "Fixing version (v0.2.1)"

This reverts commit d29a0ff6990fb64a9cbc34fc26c2f6b5bf1c7bb7.

Conflicts:
	bower.json
	package.json
fixed version.
updated AngularJS to 1.2.18
Merge branch 'master' into gh-pages