Squashed 'AngularJS/angularjs-up-and-running/' changes from dd25bc4..f04e7c6

f04e7c6 Merge pull request #12 from icese7en/patch-1
c2ad27a Offer an solution for the 1.3.x version

git-subtree-dir: AngularJS/angularjs-up-and-running
git-subtree-split: f04e7c6883f9afee2ac0749ede2f4234c37e035b
Merge commit '05e3861b8e3f1e078dc2e8f40fb3b781db4827e6'

Conflicts:
	AngularJS/angularjs-up-and-running/chapter4/checkbox-example.html