chore(package.json): update devDependencies
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	package.json
Merge branch 'master' into develop
chore(grunt): add ci task for karma

- add unit tests for lx-form
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	package.json
	vendor/angular-ui-utils/angular-ui-utils.js
	vendor/angular-ui-utils/angular-ui-utils.min.js
chore(grunt): update browser loading for karma
chore(grunt): update browser loading for karma
Merge remote-tracking branch 'origin/develop' into develop
indeterminate bugfix
modify gitignore
ignore
refactor demo app
Merge branch 'develop'
Merge branch 'master' into github-master