2 commits

Author	SHA1	Message	Date
alecmerdler	01f99f6133	resolved conflicts with master branch	2017-01-19 12:21:22 -08:00
alecmerdler	8a9a2972ec	moved naming patterns to seperate module and Angular constant	2017-01-19 01:48:15 -08:00