documentation for controllers
conflict merge and rename date type and corrected documentation for generate Hash
conflict merge 2
conflict merge 3
not optional
isShown
corrected class = selected of selected text-error
change text-error on text-info
pull
Merge pull request #176 from dkonurov/master

documentation for controllers