Merge branch 'master' of https://github.com/Neonilla/MyProjects

Conflicts:
ANTableViewController.h
Merge branch 'master' of https://github.com/Neonilla/MyProjects