Merge pull request #7 from kvnanytv/master

Initial designs commit
Merge pull request #1 from jbantug/master

update 090513
Advertiser and Affiliates
Merge pull request #8 from delorenzana/master

Advertisers and Affiliates
Affiliates and users management
Merge pull request #9 from delorenzana/master

Affiliates and users management
Translations
Merge pull request #10 from delorenzana/master

Translations
Merge pull request #11 from kvnanytv/master

New design commits
Merge pull request #2 from jbantug/master

Merge
Advertiser and Country views
secured parameters
removed parameters.yml
edited gitignore
Merge pull request #12 from delorenzana/master

merge 091713
Security
edited gitignore to ignore security.yml
Merge pull request #13 from delorenzana/master

security
Merge pull request #14 from kvnanytv/master

design update 092013
Merge pull request #3 from jbantug/master

update fork