update grunt
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/functions.php
travis icon added
Delete config.properties
Delete private.properties
Delete private.xml
Update .gitignore
update server updated.
Update package.json
Built with Grunt
build with grunt
build with grunt
Update .travis.yml
Update .travis.yml
add grunt-contribs
Update .travis.yml
see:

http://stackoverflow.com/questions/23613902/testing-with-travis-ci-an-angularjs-application-that-uses-sass
Update .travis.yml
Update .travis.yml
Create .jshintrc