fixed a.button style
merge versions
Merge branch 'release/1.0' into feature/db-integrate

Conflicts:
	bower.json
	package.json
	static/less/style.less
migrating models over
added encryption to build