Added info and link about Annotations in class and methods tab
Info and links about annotations added
Resolving conflicts